Fix #440 - Added extra checks required