Revert "Req-011: Fixed Bug: NullPointerExceptions"
Revert "Req-011: Fixed Bug: NullPointerExceptions"

This reverts commit 85f759a83bdf28b4bf8a5df7f3d161ba48ac7f24.

uv48uson/amos-ss15-proj3,yadimon/amos-ss15-proj3,yadimon/amos-ss15-proj3,uv48uson/amos-ss15-proj3,uv48uson/amos-ss15-proj3,AMOSTeam3/amos-ss15-proj3,uv48uson/amos-ss15-proj3,yadimon/amos-ss15-proj3,AMOSTeam3/amos-ss15-proj3,AMOSTeam3/amos-ss15-proj3,yadimon/amos-ss15-proj3,AMOSTeam3/amos-ss15-proj3