Removed null check.
Merge branch 'dev-darren' of https://github.com/addicteduser/CSC611M-DropOS into dev-darren