Resolved bugs with crashing of Props function for invalid input keys

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>